From dc86c744bf2422c0a5d51c718e8e844033388068 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Thu, 5 Mar 2020 06:53:26 +0100 Subject: [PATCH] rbtree: Simplify macros * NODE_FROM_POINTER() can not be NULL * shuffle NODE_TO_POINTER() code for readability so that the NULL check is on the outside and not the cast --- gtk/gtkrbtree.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gtk/gtkrbtree.c b/gtk/gtkrbtree.c index 55914d7cb6..79bb9b5911 100644 --- a/gtk/gtkrbtree.c +++ b/gtk/gtkrbtree.c @@ -61,8 +61,8 @@ struct _GtkRbNode }; }; -#define NODE_FROM_POINTER(ptr) ((GtkRbNode *) ((ptr) ? (((guchar *) (ptr)) - sizeof (GtkRbNode)) : NULL)) -#define NODE_TO_POINTER(node) ((gpointer) ((node) ? (((guchar *) (node)) + sizeof (GtkRbNode)) : NULL)) +#define NODE_FROM_POINTER(ptr) ((GtkRbNode *) (((guchar *) (ptr)) - sizeof (GtkRbNode))) +#define NODE_TO_POINTER(node) ((node) ? ((gpointer) (((guchar *) (node)) + sizeof (GtkRbNode))) : NULL) #define NODE_TO_AUG_POINTER(tree, node) ((gpointer) ((node) ? (((guchar *) (node)) + sizeof (GtkRbNode) + (tree)->element_size) : NULL)) static inline gboolean -- 2.30.2